(cherry picked from commit 9c77909)

…ider, to count records in a safe/performant way

(cherry picked from commit 9a325ef)

(cherry picked from commit cf3d30d)

…tion()

(cherry picked from commit 5539710)

(cherry picked from commit c1bcdc8)

(cherry picked from commit 5e3cc1b)

(cherry picked from commit 6fca5cb)

(cherry picked from commit a844d61)

…option

(cherry picked from commit 82013e2)

(cherry picked from commit d26d5a0)

(cherry picked from commit 2280be7)

(cherry picked from commit 483f207)

…Factory

(cherry picked from commit d9c1a6f)